From 3cf74174d09f34d9f0f045d04b7f2bf9ed5a53c7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 20 Sep 2018 18:33:13 +0100 Subject: [PATCH] wip --- debian/rules | 2 +- tools/Rules.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3c1e3a7854..7f2bcc8bbe 100755 --- a/debian/rules +++ b/debian/rules @@ -69,7 +69,7 @@ make_args_xen= $(make_args_common) \ make_args_tools= $(make_args_common) \ EXTRA_CFLAGS_XEN_TOOLS='$(dpkg_CFLAGS) $(dpkg_CPPFLAGS)' \ - LDFLAGS='$(dpkg_LDFLAGS)' + PREPEND_LDFLAGS_XEN_TOOLS='$(dpkg_LDFLAGS)' OCAMLDESTDIR=$(CURDIR)/$(BUILD_DIR)/install-utils_$(ARCH)/$(OCAML_STDLIB_DIR) \ PYTHON=$(shell pyversions -r) diff --git a/tools/Rules.mk b/tools/Rules.mk index 75089822b2..a46f10e34a 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -9,6 +9,8 @@ include $(XEN_ROOT)/Config.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install +LDFLAGS += $(PREPEND_LDFLAGS_XEN_TOOLS) + LDFLAGS_RPATH = -Wl,-rpath,'$${ORIGIN}$(if $(1),/$(1))' XEN_INCLUDE = $(XEN_ROOT)/tools/include -- 2.30.2